diff options
| author | Silarn <jrim@rimpo.org> | 2018-05-06 10:18:23 -0500 |
|---|---|---|
| committer | Silarn <jrim@rimpo.org> | 2018-05-06 10:18:23 -0500 |
| commit | 5f8bbaae2aa8486859fedc12ec0372b0cf83d709 (patch) | |
| tree | 2c9356b9e2150a0d0341719e720c1011aa66b97c | |
| parent | fe33d7af43465f0ee46eab8353bb4f3d4b145331 (diff) | |
Make sure project_path is set before trying to use it
| -rw-r--r-- | src/CMakeLists.txt | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8463f098..77ee4dfc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -240,6 +240,13 @@ SOURCE_GROUP(Source FILES ${organizer_SRCS}) SOURCE_GROUP(Headers FILES ${organizer_HDRS}) SOURCE_GROUP(UI FILES ${organizer_UIS}) +# MO projects +SET(default_project_path "${CMAKE_SOURCE_DIR}/..") +GET_FILENAME_COMPONENT(${default_project_path} ${default_project_path} REALPATH) + +SET(project_path "${default_project_path}" CACHE PATH "path to the other mo projects") +#TODO this should not be a hardcoded path +SET(lib_path "${project_path}/../../install/libs") # Qt5 SET(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -276,16 +283,6 @@ LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) FIND_PACKAGE(zlib REQUIRED) # TODO FindZlib doesn't find the static zlib library - -# MO projects -SET(default_project_path "${CMAKE_SOURCE_DIR}/..") -GET_FILENAME_COMPONENT(${default_project_path} ${default_project_path} REALPATH) - -SET(project_path "${default_project_path}" CACHE PATH "path to the other mo projects") -#TODO this should not be a hardcoded path -SET(lib_path "${project_path}/../../install/libs") - - INCLUDE_DIRECTORIES(${project_path}/uibase/src ${project_path}/bsatk/src ${project_path}/esptk/src |