Bladeren bron

disable cmake test and install executable in test

mikymod 12 jaren geleden
bovenliggende
commit
1fbbf0cd94

+ 3 - 0
engine/CMakeLists.txt

@@ -525,9 +525,12 @@ if (CROWN_BUILD_TESTS)
 	add_subdirectory(tests)
 	add_subdirectory(tests)
 endif (CROWN_BUILD_TESTS)
 endif (CROWN_BUILD_TESTS)
 
 
+
 install (TARGETS crown DESTINATION bin)
 install (TARGETS crown DESTINATION bin)
 install (TARGETS ${CROWN_EXECUTABLE_NAME} DESTINATION bin)
 install (TARGETS ${CROWN_EXECUTABLE_NAME} DESTINATION bin)
 
 
+install (TARGETS crown DESTINATION test)
+
 #install (FILES ${HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME})
 #install (FILES ${HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME})
 
 
 #install (FILES ${CORE_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/core)
 #install (FILES ${CORE_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/core)

+ 8 - 0
engine/third/win32/CMakeLists.txt

@@ -16,3 +16,11 @@ endif (WINDOWS)
 
 
 install (PROGRAMS luajit/bin/luajit.exe DESTINATION bin)
 install (PROGRAMS luajit/bin/luajit.exe DESTINATION bin)
 install (DIRECTORY luajit/share/luajit-2.0.1/jit DESTINATION bin)
 install (DIRECTORY luajit/share/luajit-2.0.1/jit DESTINATION bin)
+
+if (WINDOWS)
+	install (FILES luajit/lib/lua51.dll DESTINATION test)
+	install (FILES luajit/lib/luajit-5.1.dll DESTINATION test)	
+endif (WINDOWS)
+
+install (PROGRAMS luajit/bin/luajit.exe DESTINATION test)
+install (DIRECTORY luajit/share/luajit-2.0.1/jit DESTINATION test)

+ 8 - 0
engine/third/win64/CMakeLists.txt

@@ -16,3 +16,11 @@ endif (WINDOWS)
 
 
 install (PROGRAMS luajit/bin/luajit.exe DESTINATION bin)
 install (PROGRAMS luajit/bin/luajit.exe DESTINATION bin)
 install (DIRECTORY luajit/share/luajit-2.0.1/jit DESTINATION bin)
 install (DIRECTORY luajit/share/luajit-2.0.1/jit DESTINATION bin)
+
+if (WINDOWS)
+	install (FILES luajit/lib/lua51.dll DESTINATION test)
+	install (FILES luajit/lib/luajit-5.1.dll DESTINATION test)	
+endif (WINDOWS)
+
+install (PROGRAMS luajit/bin/luajit.exe DESTINATION test)
+install (DIRECTORY luajit/share/luajit-2.0.1/jit DESTINATION test)

+ 7 - 0
engine/third/x86/CMakeLists.txt

@@ -14,3 +14,10 @@ install (FILES luajit/lib/libluajit-5.1.so.2.0.2
 install (PROGRAMS luajit/bin/luajit-2.0.2 DESTINATION bin)
 install (PROGRAMS luajit/bin/luajit-2.0.2 DESTINATION bin)
 install (FILES luajit/bin/luajit DESTINATION bin)
 install (FILES luajit/bin/luajit DESTINATION bin)
 install (DIRECTORY luajit/share/luajit-2.0.2/jit DESTINATION bin)
 install (DIRECTORY luajit/share/luajit-2.0.2/jit DESTINATION bin)
+
+install (FILES luajit/lib/libluajit-5.1.so.2.0.1 
+			   luajit/lib/libluajit-5.1.so.2 DESTINATION test)
+
+install (PROGRAMS luajit/bin/luajit-2.0.1 DESTINATION test)
+install (FILES luajit/bin/luajit DESTINATION test)
+install (DIRECTORY luajit/share/luajit-2.0.1/jit DESTINATION test)

+ 8 - 1
engine/third/x86_64/CMakeLists.txt

@@ -13,4 +13,11 @@ install (FILES luajit/lib/libluajit-5.1.so.2.0.1
 
 
 install (PROGRAMS luajit/bin/luajit-2.0.1 DESTINATION bin)
 install (PROGRAMS luajit/bin/luajit-2.0.1 DESTINATION bin)
 install (FILES luajit/bin/luajit DESTINATION bin)
 install (FILES luajit/bin/luajit DESTINATION bin)
-install (DIRECTORY luajit/share/luajit-2.0.1/jit DESTINATION bin)
+install (DIRECTORY luajit/share/luajit-2.0.1/jit DESTINATION bin)
+
+install (FILES luajit/lib/libluajit-5.1.so.2.0.1 
+			   luajit/lib/libluajit-5.1.so.2 DESTINATION test)
+
+install (PROGRAMS luajit/bin/luajit-2.0.1 DESTINATION test)
+install (FILES luajit/bin/luajit DESTINATION test)
+install (DIRECTORY luajit/share/luajit-2.0.1/jit DESTINATION test)