From 5e6604cf135117698ebc1c96ab99c5baddc6eca3 Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Sun, 12 Jul 2015 14:27:05 -0700 Subject: [PATCH] These flags are meaningless outside of Windows --- CMakeLists.txt | 18 ++++++++++-------- .../pfLocalizationMgr/CMakeLists.txt | 9 ++++++--- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e38406e2..242a83dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,14 +69,16 @@ endif() include(PrecompiledHeader) #Precompiled Header helper macros -# libCurl isn't smart enough to detect this for us, so we have to configure it ourselves -option(CURL_IS_STATIC "Using the static version of libcurl?" ON) -if(CURL_IS_STATIC) - add_definitions(-DCURL_STATICLIB) -endif(CURL_IS_STATIC) - -# Same story for expat -option(EXPAT_IS_STATIC "Using the static version of libexpat" ON) +if(WIN32) + # libCurl isn't smart enough to detect this for us, so we have to configure it ourselves + option(CURL_IS_STATIC "Using the static version of libcurl?" ON) + if(CURL_IS_STATIC) + add_definitions(-DCURL_STATICLIB) + endif(CURL_IS_STATIC) + + # Same story for expat + option(EXPAT_IS_STATIC "Using the static version of libexpat" ON) +endif(WIN32) option(PLASMA_EXTERNAL_RELEASE "Is this release intended for the general public?" OFF) if(PLASMA_EXTERNAL_RELEASE) diff --git a/Sources/Plasma/FeatureLib/pfLocalizationMgr/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfLocalizationMgr/CMakeLists.txt index a810b69c..06c50272 100644 --- a/Sources/Plasma/FeatureLib/pfLocalizationMgr/CMakeLists.txt +++ b/Sources/Plasma/FeatureLib/pfLocalizationMgr/CMakeLists.txt @@ -3,9 +3,12 @@ include_directories(../../PubUtilLib) include_directories(${EXPAT_INCLUDE_DIR}) -add_definitions(-DWIN32) -if(EXPAT_IS_STATIC) - add_definitions(-DXML_STATIC) +if(WIN32) + add_definitions(-DWIN32) + + if(EXPAT_IS_STATIC) + add_definitions(-DXML_STATIC) + endif() endif() set(pfLocalizationMgr_SOURCES