Merge pull request #18 from kimkulling/kimkulling-unittests_fix

kimkulling · web-flow · commit d0c3b9c882f7 · 2021-03-16T09:25:17.000+01:00
Add prefix to option BUILD_UNITTESTS
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,7 +10,7 @@ if( CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX )
     find_package(Threads)
 endif()
 
-option( BUILD_UNITTESTS 
+option( CPPCORE_BUILD_UNITTESTS 
     "Build unit tests."
      ON 
 )
@@ -123,7 +123,7 @@ ADD_LIBRARY( cppcore SHARED
 )
 
 
-IF( BUILD_UNITTESTS )
+IF( CPPCORE_BUILD_UNITTESTS )
     SET( cppcore_test_src  
         test/CPPCoreCommonTest.cpp 
     )
@@ -177,4 +177,4 @@ IF( BUILD_UNITTESTS )
         SET( platform_libs pthread )
     ENDIF( WIN32 )
     target_link_libraries( cppcore_unittest cppcore ${CMAKE_THREAD_LIBS_INIT} gtest_main ${platform_libs} )
-ENDIF( BUILD_UNITTESTS )
+ENDIF()

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ if( CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX )`
`10`	`10`	`find_package(Threads)`
`11`	`11`	`endif()`
`12`	`12`
`13`		`-option( BUILD_UNITTESTS`
	`13`	`+option( CPPCORE_BUILD_UNITTESTS`
`14`	`14`	`"Build unit tests."`
`15`	`15`	`ON`
`16`	`16`	`)`
`@@ -123,7 +123,7 @@ ADD_LIBRARY( cppcore SHARED`
`123`	`123`	`)`
`124`	`124`
`125`	`125`
`126`		`-IF( BUILD_UNITTESTS )`
	`126`	`+IF( CPPCORE_BUILD_UNITTESTS )`
`127`	`127`	`SET( cppcore_test_src`
`128`	`128`	`test/CPPCoreCommonTest.cpp`
`129`	`129`	`)`
`@@ -177,4 +177,4 @@ IF( BUILD_UNITTESTS )`
`177`	`177`	`SET( platform_libs pthread )`
`178`	`178`	`ENDIF( WIN32 )`
`179`	`179`	`target_link_libraries( cppcore_unittest cppcore ${CMAKE_THREAD_LIBS_INIT} gtest_main ${platform_libs} )`
`180`		`-ENDIF( BUILD_UNITTESTS )`
	`180`	`+ENDIF()`