diff --git a/CMakeLists.txt b/CMakeLists.txt index b5a4ebc..8b6ff71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,7 @@ if(MSVC) # Windows # std::numeric_limits<...>::max() # (http://stackoverflow.com/questions/1904635/warning-c4003-and-errors-c2589-and-c2059-on-x-stdnumeric-limitsintmax). set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DNOMINMAX") -else() # Linux +else() # Linux or macOS # Common options. set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic") @@ -69,7 +69,9 @@ if(RETDEC_IDAPLUGIN_DOC) set(RELEASE_LICENSE_DIR "${RELEASE_DIR}/license") if(MSVC) # Windows set(RELEASE_OS_NAME "windows") - else() + elseif(APPLE) # macOS + set(RELEASE_OS_NAME "macOS") + else() # Linux set(RELEASE_OS_NAME "linux") endif() add_custom_target(release diff --git a/src/idaplugin/CMakeLists.txt b/src/idaplugin/CMakeLists.txt index de63a1d..56ef401 100644 --- a/src/idaplugin/CMakeLists.txt +++ b/src/idaplugin/CMakeLists.txt @@ -9,10 +9,8 @@ set(FINAL_PLUGIN_NAME "retdec") # Windows. if(MSVC) add_definitions(-D__NT__) #-DWIN32 - if(MSVC) - set(IDASDK_LIBRARIES "${IDA_SDK_DIR}/lib/x64_win_vc_32/ida.lib") - endif() -elseif (APPLE) + set(IDASDK_LIBRARIES "${IDA_SDK_DIR}/lib/x64_win_vc_32/ida.lib") +elseif(APPLE) ADD_DEFINITIONS (-D__MAC__) set(IDASDK_LIBRARIES "${IDA_SDK_DIR}/lib/x64_mac_gcc_32/libida.dylib") # Linux.