ソースを参照

cmake added var for postbuild_step run test

Johannes Ruehle 12 年 前
コミット
1105c53bb0
2 ファイル変更5 行追加2 行削除
  1. 1 0
      CMakeLists.txt
  2. 4 2
      core/CMakeLists.txt

+ 1 - 0
CMakeLists.txt

@@ -129,6 +129,7 @@ set(BUILD_CORE_BASICS ON)
 #set(BUILD_CORE_IMAGE ON)
 #set(BUILD_CORE_MATLABACCESS ON)
 set(BUILD_CORE_TESTS ON)
+set(BUILD_CORE_TESTS_PERFORM_AS_POSTBUILD_STEP OFF)
 set(BUILD_CORE_PROGS OFF)
 
 

+ 4 - 2
core/CMakeLists.txt

@@ -32,12 +32,14 @@ if(BUILD_CORE_TESTS)
     ADD_EXECUTABLE( ${__testname} ../templates/cppUnitTestRunner.cpp ${__testcpp})
     TARGET_LINK_LIBRARIES(${__testname} nice_core ${CPPUNIT_LIBRARIES} )
 
-    INSTALL(TARGETS ${__testname} DESTINATION bin)
+    INSTALL(TARGETS ${__testname} DESTINATION tests)
 	SET_PROPERTY(TARGET ${__testname} PROPERTY FOLDER "unittests")
-	add_custom_command(TARGET ${__testname}
+	if(BUILD_CORE_TESTS_PERFORM_AS_POSTBUILD_STEP)
+		add_custom_command(TARGET ${__testname}
                    POST_BUILD
                    COMMAND "$<TARGET_FILE:${__testname}>"
                    COMMENT "Unit Tests...")
+	endif()
   endforeach()
 endif()