Skip to content

Commit

Permalink
Explicitly set CMake sub-projects to compile as static libs. This hel…
Browse files Browse the repository at this point in the history
…ps with Linux build systems
  • Loading branch information
raptor committed Mar 11, 2017
1 parent 5455f3d commit 70a01d9
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion alure/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if(NOT WIN32)
endif()


add_library(alure ${ALURE_SOURCES})
add_library(alure STATIC ${ALURE_SOURCES})
include_directories(
${OPENAL_INCLUDE_DIR}
${OGG_INCLUDE_DIR}
Expand Down
2 changes: 1 addition & 1 deletion clipper/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
add_library(clipper
add_library(clipper STATIC
${CMAKE_CURRENT_SOURCE_DIR}/clipper.cpp
${CMAKE_CURRENT_SOURCE_DIR}/clipper.hpp
)
2 changes: 1 addition & 1 deletion poly2tri/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
add_library(poly2tri
add_library(poly2tri STATIC
${CMAKE_CURRENT_SOURCE_DIR}/common/shapes.cc
${CMAKE_CURRENT_SOURCE_DIR}/sweep/advancing_front.cc
${CMAKE_CURRENT_SOURCE_DIR}/sweep/cdt.cc
Expand Down
2 changes: 1 addition & 1 deletion sqlite/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
add_library(sqlite
add_library(sqlite STATIC
${CMAKE_CURRENT_SOURCE_DIR}/sqlite3.c
${CMAKE_CURRENT_SOURCE_DIR}/sqlite3.h
)
2 changes: 1 addition & 1 deletion tnl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ if(NO_THREADS)
endif()

include_directories(${TOMCRYPT_INCLUDE_DIR} SYSTEM)
add_library(tnl ${TNL_SOURCES} ${TNL_HEADERS})
add_library(tnl STATIC ${TNL_SOURCES} ${TNL_HEADERS})
target_link_libraries(tnl tomcrypt ${CMAKE_THREAD_LIBS_INIT})

set_target_properties(tnl PROPERTIES COMPILE_DEFINITIONS_DEBUG "TNL_DEBUG;TNL_ENABLE_LOGGING")
2 changes: 1 addition & 1 deletion tomcrypt/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
add_library(tomcrypt
add_library(tomcrypt STATIC
${CMAKE_CURRENT_SOURCE_DIR}/src/pk/rsa/rsa_decrypt_key.c
${CMAKE_CURRENT_SOURCE_DIR}/src/pk/rsa/rsa_verify_hash.c
${CMAKE_CURRENT_SOURCE_DIR}/src/pk/rsa/rsa_sign_hash.c
Expand Down

0 comments on commit 70a01d9

Please sign in to comment.