Quellcode durchsuchen

Fix DLL installation with MSVC

Fabian Wolff vor 9 Jahren
Ursprung
Commit
dc4eb2ad3e
3 geänderte Dateien mit 16 neuen und 16 gelöschten Zeilen
  1. 2 2
      sq/CMakeLists.txt
  2. 13 13
      sqstdlib/CMakeLists.txt
  3. 1 1
      squirrel/CMakeLists.txt

+ 2 - 2
sq/CMakeLists.txt

@@ -1,11 +1,11 @@
 add_executable(sq sq.c)
 set_target_properties(sq PROPERTIES LINKER_LANGUAGE C)
-target_link_libraries(sq squirrel sqstd)
+target_link_libraries(sq squirrel sqstdlib)
 install(TARGETS sq RUNTIME DESTINATION bin)
 
 add_executable(sq_static sq.c)
 set_target_properties(sq_static PROPERTIES LINKER_LANGUAGE C)
-target_link_libraries(sq_static squirrel_static sqstd_static)
+target_link_libraries(sq_static squirrel_static sqstdlib_static)
 
 if(CMAKE_COMPILER_IS_GNUCXX)
   set_target_properties(sq_static PROPERTIES COMPILE_FLAGS "-static -Wl,-static")

+ 13 - 13
sqstdlib/CMakeLists.txt

@@ -1,15 +1,15 @@
-set(SQSTD_SRC sqstdblob.cpp
-              sqstdio.cpp
-              sqstdstream.cpp
-              sqstdmath.cpp
-              sqstdsystem.cpp
-              sqstdstring.cpp
-              sqstdaux.cpp
-              sqstdrex.cpp)
+set(SQSTDLIB_SRC sqstdblob.cpp
+                 sqstdio.cpp
+                 sqstdstream.cpp
+                 sqstdmath.cpp
+                 sqstdsystem.cpp
+                 sqstdstring.cpp
+                 sqstdaux.cpp
+                 sqstdrex.cpp)
 
-add_library(sqstd SHARED ${SQSTD_SRC})
-target_link_libraries(sqstd squirrel)
-install(TARGETS sqstd LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+add_library(sqstdlib SHARED ${SQSTDLIB_SRC})
+target_link_libraries(sqstdlib squirrel)
+install(TARGETS sqstdlib RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
 
-add_library(sqstd_static STATIC ${SQSTD_SRC})
-install(TARGETS sqstd_static ARCHIVE DESTINATION lib)
+add_library(sqstdlib_static STATIC ${SQSTDLIB_SRC})
+install(TARGETS sqstdlib_static ARCHIVE DESTINATION lib)

+ 1 - 1
squirrel/CMakeLists.txt

@@ -12,7 +12,7 @@ set(SQUIRREL_SRC sqapi.cpp
                  sqclass.cpp)
 
 add_library(squirrel SHARED ${SQUIRREL_SRC})
-install(TARGETS squirrel LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+install(TARGETS squirrel RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
 
 add_library(squirrel_static STATIC ${SQUIRREL_SRC})
 install(TARGETS squirrel_static ARCHIVE DESTINATION lib)