Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Modify CMake order of operations #561

Merged
merged 3 commits into from
Jun 9, 2019
Merged

Modify CMake order of operations #561

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
576a6fa
Modify cmake order of operations
jameskr97 Jun 5, 2019
5fd590b
Load external libraries before linking
jameskr97 Jun 5, 2019
d2d08da
Update ninja-build color options to be OS specific.
jameskr97 Jun 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,13 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # Export compile com
set(CMAKE_CONFIGURATION_TYPES "Release;RelWithDebInfo") # What configurations types do we want to support? (Changes what shows up in Visual Studio)
set_property(GLOBAL PROPERTY USE_FOLDERS ON) # Enable folders/filters within IDE's

## Ninja specific setup (Different compilers required different color force commands)
if(CMAKE_GENERATOR STREQUAL "Ninja")
set(CMAKE_CXX_FLAGS "-fcolor-diagnostics") # Required flag to get color output from Ninja
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options("-fcolor-diagnostics")
elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
add_compile_options("-fdiagnostics-color=always")
endif()
endif()

## Extern Library Variables
Expand All @@ -43,12 +48,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/CMake/Modules) # Tell CMake whe
# Project Build Targets
add_executable(Etterna)

## Source - Add source to the Etterna target
add_subdirectory(extern EXCLUDE_FROM_ALL) # EXCLUDE_FROM_ALL so those install components are not in out install compnenets
add_subdirectory(src/Etterna)
add_subdirectory(src/arch)
add_subdirectory(src/archutils)
add_subdirectory(src/RageUtil)
# Load external libraries
add_subdirectory(extern EXCLUDE_FROM_ALL) # EXCLUDE_FROM_ALL to exclude from cpack binary

## Setting Target Properties
### TODO: Temp output directories. Switch to out-of-source
Expand Down Expand Up @@ -102,6 +103,12 @@ elseif(UNIX)
include(CMake/Helpers/CMakeLinux.cmake)
endif()

## Source - Add source to the Etterna target
add_subdirectory(src/Etterna)
add_subdirectory(src/arch)
add_subdirectory(src/archutils)
add_subdirectory(src/RageUtil)

# Static Analysis
include(CMake/Helpers/StaticAnalysis.cmake)

Expand Down