Skip to content

Commit

Permalink
Persitently update platform information
Browse files Browse the repository at this point in the history
  • Loading branch information
IssMneur committed Oct 24, 2016
1 parent b582cd8 commit 636e844
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 17 deletions.
17 changes: 1 addition & 16 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,7 @@ if(NOT GIT_EXECUTABLE)
" - Call cmake with -DGIT_EXECUTABLE=<full path to git>")
endif()

if(NOT(DEFINED IS_WIN32 OR DEFINED IS_LINUX OR DEFINED IS_APPLE))
if(WIN32)
set(IS_WIN32 TRUE)
set(USE_3RDPARTY_DEFAULT ON)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(IS_APPLE TRUE)
set(USE_3RDPARTY_DEFAULT ON)
else()
set(IS_LINUX TRUE)
set(USE_3RDPARTY_DEFAULT OFF)
endif()
endif()

include(cmake/wxl_platforms.cmake)
# Special source directories
set(LAUNCHER_CMAKE_SOURCE_DIR ${CMAKE_SOURCE_DIR}/cmake)
include(${LAUNCHER_CMAKE_SOURCE_DIR}/setup_submodules.cmake)
Expand All @@ -50,9 +38,6 @@ if(USE_3RDPARTY)
message("--- Using 3rd party source directory")
execute_process(COMMAND ${CMAKE_COMMAND}
-P ${3RD_PARTY_SOURCE_DIR}/build_deps.cmake
-DIS_WIN32=${IS_WIN32}
-DIS_LINUX=${IS_LINUX}
-DIS_APPLE=${IS_APPLE}
WORKING_DIRECTORY ${3RD_PARTY_SOURCE_DIR}
RESULT_VARIABLE USE_3RDPARTY_BUILD
)
Expand Down
10 changes: 10 additions & 0 deletions cmake/wxl_platforms.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
if(WIN32)
set(IS_WIN32 TRUE)
set(USE_3RDPARTY_DEFAULT ON)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(IS_APPLE TRUE)
set(USE_3RDPARTY_DEFAULT ON)
else()
set(IS_LINUX TRUE)
set(USE_3RDPARTY_DEFAULT OFF)
endif()
2 changes: 1 addition & 1 deletion vendor

0 comments on commit 636e844

Please sign in to comment.