diff options
| author | Daniel Guzman <daniel.guzman85@gmail.com> | 2016-04-06 22:07:07 +0200 |
|---|---|---|
| committer | Daniel Guzman <daniel.guzman85@gmail.com> | 2016-04-10 22:09:12 +0200 |
| commit | 76828e68aa9b30c4c6afac2fbbac1964d11226b6 (patch) | |
| tree | e52ae0be7abef62c7cb6255c69e0f37f095451a1 | |
| parent | dd2e781d38d34a574bb173f70bb20f0aa3439246 (diff) | |
Fixed shared library compilation.
- Fixed that when ENTITYX_BUILD_SHARED=1 was compiling the static
library and the shared_library. Now it only compiles one of them, shared
or static, but not both. Using visual studio compiler, now, the shared
library doesn't create a .lib file (because it doesn't export anything
which is OK). This will be the next step.
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 993badb..8760165 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -129,11 +129,9 @@ message("-- Checking misc features") require(HAVE_STDINT_H "stdint.h") # Things to install -set(install_libs entityx) + set(sources entityx/System.cc entityx/Event.cc entityx/Entity.cc entityx/help/Timer.cc entityx/help/Pool.cc) -add_library(entityx STATIC ${sources}) -set_target_properties(entityx PROPERTIES DEBUG_POSTFIX -d FOLDER entityx) if (ENTITYX_BUILD_SHARED) message("-- Building shared libraries (-DENTITYX_BUILD_SHARED=0 to only build static librarires)") @@ -147,7 +145,11 @@ if (ENTITYX_BUILD_SHARED) VERSION ${ENTITYX_VERSION} SOVERSION ${ENTITYX_MAJOR_VERSION} FOLDER entityx) - list(APPEND install_libs entityx_shared) + set(install_libs entityx_shared) +else() + add_library(entityx STATIC ${sources}) + set_target_properties(entityx PROPERTIES DEBUG_POSTFIX -d FOLDER entityx) + set(install_libs entityx) endif (ENTITYX_BUILD_SHARED) if (ENTITYX_BUILD_TESTING) @@ -197,4 +199,5 @@ install( TARGETS ${install_libs} LIBRARY DESTINATION "${libdir}" ARCHIVE DESTINATION "${libdir}" + RUNTIME DESTINATION "bin" ) |