Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-07 03:12:36 +01:00
Code Issues Projects Releases Activity

cmake: expand module path before configure rw_interface

Browse Source
This commit is contained in:
Anonymous Maarten 2018-02-22 02:38:57 +01:00
parent 23072a5e99
commit 8f86154ec8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -7,8 +7,7 @@ include(GNUInstallDirs)
# Read the configuration arguments
include("${PROJECT_SOURCE_DIR}/cmake_options.cmake")
# Create a rw_interface TARGET that holds all compiler options
include("${PROJECT_SOURCE_DIR}/cmake_configure.cmake")
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
# Include git hash in source
include(GetGitRevisionDescription)
@ -27,6 +26,9 @@ if(CHECK_CLANGTIDY)
find_package(ClangTidy REQUIRED)
endif()
# Create a rw_interface TARGET that holds all compiler options
include("${PROJECT_SOURCE_DIR}/cmake_configure.cmake")
add_subdirectory(rwlib)
add_subdirectory(rwengine)
add_subdirectory(rwgame)

2
cmake_configure.cmake
View File

@ -48,8 +48,6 @@ target_compile_definitions(rw_interface
"RW_PROFILER=$<BOOL:${ENABLE_PROFILING}>"
)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
target_compile_definitions(rw_interface INTERFACE "RW_LINUX")
elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")