Mercurial > code
changeset 362:ff5b46474895
- Fix WITH_DYNLIB=Off
- Fix generate-unicode on Linux
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Tue, 28 Apr 2015 11:50:44 +0200 |
| parents | 412c3e26bb40 |
| children | 3908306107d4 |
| files | CMakeLists.txt tools/mkunicode/CMakeLists.txt |
| diffstat | 2 files changed, 15 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Tue Apr 28 11:40:42 2015 +0200 +++ b/CMakeLists.txt Tue Apr 28 11:50:44 2015 +0200 @@ -220,16 +220,18 @@ ${code_SOURCE_DIR}/C++/doc/Dynlib/macro/DYNLIB_EXPORT.md ) -if (CMAKE_SYSTEM_NAME MATCHES "Linux") - target_link_libraries(dynlib dl) +if (WITH_DYNLIB) + if (CMAKE_SYSTEM_NAME MATCHES "Linux") + target_link_libraries(dynlib dl) + endif () + + target_compile_definitions(dynlib PRIVATE EXTENSION=\"${EXTENSION}\") + + add_library(dynlib-plugin MODULE ${code_SOURCE_DIR}/C++/tests/Dynlib/Plugin.cpp) + set_target_properties(dynlib-plugin PROPERTIES PREFIX "") + target_include_directories(dynlib-plugin PRIVATE ${code_SOURCE_DIR}/C++/modules/Dynlib) endif () -target_compile_definitions(dynlib PRIVATE EXTENSION=\"${EXTENSION}\") - -add_library(dynlib-plugin MODULE ${code_SOURCE_DIR}/C++/tests/Dynlib/Plugin.cpp) -set_target_properties(dynlib-plugin PROPERTIES PREFIX "") -target_include_directories(dynlib-plugin PRIVATE ${code_SOURCE_DIR}/C++/modules/Dynlib) - # --------------------------------------------------------- # Flags # ---------------------------------------------------------
--- a/tools/mkunicode/CMakeLists.txt Tue Apr 28 11:40:42 2015 +0200 +++ b/tools/mkunicode/CMakeLists.txt Tue Apr 28 11:50:44 2015 +0200 @@ -28,11 +28,11 @@ add_custom_target( generate-unicode COMMAND - $<TARGET_FILE:cccat> ${mkunicode_SOURCE_DIR}/Unicode-before.cpp > ${code_SOURCE_DIR}/C++/Modules/Unicode/Unicode.cpp + $<TARGET_FILE:cccat> ${mkunicode_SOURCE_DIR}/Unicode-before.cpp > ${code_SOURCE_DIR}/C++/modules/Unicode/Unicode.cpp COMMAND - $<TARGET_FILE:mkunicode> ${mkunicode_SOURCE_DIR}/UnicodeData.txt >> ${code_SOURCE_DIR}/C++/Modules/Unicode/Unicode.cpp + $<TARGET_FILE:mkunicode> ${mkunicode_SOURCE_DIR}/UnicodeData.txt >> ${code_SOURCE_DIR}/C++/modules/Unicode/Unicode.cpp COMMAND - $<TARGET_FILE:cccat> ${mkunicode_SOURCE_DIR}/Unicode-after.cpp >> ${code_SOURCE_DIR}/C++/Modules/Unicode/Unicode.cpp + $<TARGET_FILE:cccat> ${mkunicode_SOURCE_DIR}/Unicode-after.cpp >> ${code_SOURCE_DIR}/C++/modules/Unicode/Unicode.cpp COMMAND - ${CMAKE_COMMAND} -E copy ${mkunicode_SOURCE_DIR}/Unicode.h ${code_SOURCE_DIR}/C++/Modules/Unicode -) \ No newline at end of file + ${CMAKE_COMMAND} -E copy ${mkunicode_SOURCE_DIR}/Unicode.h ${code_SOURCE_DIR}/C++/modules/Unicode +)