diff options
| author | Ladislav Zezula <zezula-at-volny-dot-cz> | 2017-10-17 20:07:08 +0200 |
|---|---|---|
| committer | Ladislav Zezula <zezula-at-volny-dot-cz> | 2017-10-17 20:07:08 +0200 |
| commit | 1de5fee2b69de899c9a1db96c90fa62db2214326 (patch) | |
| tree | 3841f97ea608bc81c373101ecea69ee164c3f073 | |
| parent | 723099c90e2377af83594629d1670c1780ac5615 (diff) | |
| parent | 17c1dd1a6af33cc95a1116237111417d5a3902c4 (diff) | |
Merge branch 'master' of https://github.com/ladislav-zezula/StormLib
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/StormLib.h | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 942f684..79e0092 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(StormLib) -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.12) set(LIBRARY_NAME storm) @@ -308,7 +308,7 @@ endif() add_library(${LIBRARY_NAME} ${LIB_TYPE} ${SRC_FILES} ${SRC_ADDITIONAL_FILES}) target_link_libraries(${LIBRARY_NAME} ${LINK_LIBS}) -target_compile_definitions(${LIBRARY_NAME} PUBLIC) #CMake should take care of the linking +target_compile_definitions(${LIBRARY_NAME} INTERFACE STORMLIB_NO_AUTO_LINK) #CMake will take care of the linking target_include_directories(${LIBRARY_NAME} PUBLIC src/) set_target_properties(${LIBRARY_NAME} PROPERTIES PUBLIC_HEADER "src/StormLib.h;src/StormPort.h") if(BUILD_SHARED_LIBS) diff --git a/src/StormLib.h b/src/StormLib.h index f7512e5..45dda2e 100644 --- a/src/StormLib.h +++ b/src/StormLib.h @@ -99,8 +99,11 @@ extern "C" { // Z - S for static-linked CRT library, D for multithreaded DLL CRT library // -#if defined(_MSC_VER) && !defined(__STORMLIB_SELF__) - +#if defined(__STORMLIB_SELF__) && !defined(STORMLIB_NO_AUTO_LINK) +#define STORMLIB_NO_AUTO_LINK // Define this if you don't want to link using pragmas when using msvc +#endif + +#if defined(_MSC_VER) && !defined(STORMLIB_NO_AUTO_LINK) #ifdef _DEBUG // DEBUG VERSIONS #ifndef _UNICODE #ifdef _DLL |