Merge pull request #7 from frederikvannoote/develop

Do not use BUILD_SHARED_LIBS as define in the code. When this define …
frederikvannoote · Feb 15, 2017 · 3a30ac0 · 3a30ac0
2 parents a0424d8 + c03df5c
commit 3a30ac0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CommonConfig.cmake b/CommonConfig.cmake
@@ -24,7 +24,7 @@ if (NOT DEFINED BUILD_SHARED_LIBS)
 endif()
 # When set to OFF, the library will be built as a static library
 if (${BUILD_SHARED_LIBS})
-    add_definitions(-DBUILD_SHARED_LIBS)
+    add_definitions(-D${PROJECT_NAME}_BUILD_SHARED_LIBS)
 endif()
 
 

diff --git a/config.cmake.in b/config.cmake.in
@@ -29,5 +29,5 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 include_directories(@TARGET_INCLUDE_INSTALL_DIRS@)
 
 if (@BUILD_SHARED_LIBS@)
-    add_definitions(-DBUILD_SHARED_LIBS)
+    add_definitions(-D@PROJECT_NAME@_BUILD_SHARED_LIBS)
 endif()