CMake fixes

pmbittner · Dec 11, 2018 · 22d2395 · 22d2395
1 parent 9c48197
commit 22d2395
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/cmake/PaxCompilerDetection.cmake b/cmake/PaxCompilerDetection.cmake
@@ -6,17 +6,17 @@ set(PAX_COMPILER_IS_MSVC FALSE)
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     # using Clang
     set(PAX_COMPILER_IS_CLANG TRUE)
-    #message("Compiler set to CLANG")
+    message("Compiler set to CLANG")
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     # using GCC
     set(PAX_COMPILER_IS_GCC TRUE)
-    #message("Compiler set to GCC")
+    message("Compiler set to GCC")
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
     # using Intel C++
     set(PAX_COMPILER_IS_INTEL TRUE)
-    #message("Compiler set to INTEL")
+    message("Compiler set to INTEL")
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
     # using Visual Studio C++
     set(PAX_COMPILER_IS_MSVC TRUE)
-    #message("Compiler set to MSVC")
+    message("Compiler set to MSVC")
 endif()
diff --git a/cmake/PaxFlagsDefinition.cmake b/cmake/PaxFlagsDefinition.cmake
@@ -9,7 +9,7 @@ set(PAX_CPP_STANDARD 11)
 
 if (WIN32)
     message("Set flags for WIN32")
-    if (${COMPILER_IS_MSVC})
+    if (${PAX_COMPILER_IS_MSVC})
         message("    and MSVC")
 
         set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS} /std:c++latest")
@@ -28,10 +28,10 @@ if (WIN32)
         foreach(CompilerFlag ${CompilerFlags})
             string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}")
         endforeach()
-    else(${COMPILER_IS_MSVC}) # condition for nested if
+    else(${PAX_COMPILER_IS_MSVC}) # condition for nested if
         message("    but not MSVC")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static -std=c++${PAX_CPP_STANDARD}")# "-static-libgcc -static-libstdc++") #this may be wrong for unix
-    endif(${COMPILER_IS_MSVC}) # condition for nested if
+    endif(${PAX_COMPILER_IS_MSVC}) # condition for nested if
 elseif(UNIX)
     message("Set flags for UNIX")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++${PAX_CPP_STANDARD}")

diff --git a/plugins/paxassetimport/CMakeLists.txt b/plugins/paxassetimport/CMakeLists.txt
@@ -16,13 +16,13 @@ set(ASSIMP_LINK_DIRECTORIES)
 set(ASSIMP_LIBRARIES)
 
 if (WIN32)
-    if (${COMPILER_IS_MSVC})
+    if (${PAX_COMPILER_IS_MSVC})
         message("Building PaxAssimp with MSVC - Release")
         set(ASSIMP_BUILD_DIRECTORY ${ASSIMP_DIRECTORY}/cmake-build-release-msvc)
         set(ASSIMP_LIBRARY_NAME assimp-vc140-mt.lib)
         set(ASSIMP_IRRXML_NAME IrrXML.lib)
         set(ASSIMP_ZLIB_NAME zlibstatic.lib)
-    elseif(${COMPILER_IS_GCC})
+    elseif(${PAX_COMPILER_IS_GCC})
         if (${CMAKE_BUILD_TYPE} MATCHES Release)
             message("Building PaxAssimp with MinGW - Release")
             set(ASSIMP_BUILD_DIRECTORY ${ASSIMP_DIRECTORY}/cmake-build-release-mingw)
@@ -36,7 +36,7 @@ if (WIN32)
             set(ASSIMP_IRRXML_NAME libIrrXMLd.a)
             set(ASSIMP_ZLIB_NAME libzlibstaticd.a)
         endif(${CMAKE_BUILD_TYPE} MATCHES Release)
-    endif(${COMPILER_IS_MSVC})
+    endif(${PAX_COMPILER_IS_MSVC})
 
     set(ASSIMP_IRRXML_DIR ${ASSIMP_BUILD_DIRECTORY}/contrib/irrXML)
     set(ASSIMP_ZLIB_DIR   ${ASSIMP_BUILD_DIRECTORY}/contrib/zlib)