Merge pull request #107 from pboettch/master

Some changes for CMakeLists.txt - one bug-fix included
hyperrealm · Feb 20, 2018 · 04a3674 · 04a3674
2 parents f891f5e + 62acbe7
commit 04a3674
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,9 +11,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/out)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/out)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/out)
 
-set(LIB_TYPE STATIC)
 if(BUILD_SHARED_LIBS)
-	set(LIB_TYPE SHARED)
 	add_definitions(-DLIBCONFIG_EXPORTS)
 	add_definitions(-DLIBCONFIGXX_EXPORTS)
 else()	

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -28,8 +28,8 @@ set(libsrc_cpp
     ${libsrc}
     libconfigcpp.cc)
 
-add_library(libconfig ${LIB_TYPE} ${libsrc} ${libinc})
-add_library(libconfig++ ${LIB_TYPE} ${libsrc_cpp} ${libinc_cpp})
+add_library(libconfig ${libsrc} ${libinc})
+add_library(libconfig++ ${libsrc_cpp} ${libinc_cpp})
 
 set_target_properties(libconfig 
     PROPERTIES LINKER_LANGUAGE C
@@ -41,14 +41,12 @@ set_target_properties(libconfig++
 target_compile_definitions(libconfig
     PRIVATE
         _CRT_SECURE_NO_DEPRECATE
-        _STDLIB_H
         YY_NO_UNISTD_H
         YY_USE_CONST )
 
 target_compile_definitions(libconfig++ 
     PRIVATE
         _CRT_SECURE_NO_DEPRECATE
-        _STDLIB_H
         YY_NO_UNISTD_H
         YY_USE_CONST )