diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2018-03-14 09:21:10 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2018-03-14 09:21:10 +0100 |
| commit | 69003943c7a1107317395e23384633691b9be801 (patch) | |
| tree | fedbbbb676d5218e0a2e18746f3ae83791a18897 | |
| parent | 8da1bc08b2ec7b1d3d8ef18a9f459b2ac4c0c2e4 (diff) | |
cmake: some cleanup
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | cmake/opentrack-platform.cmake | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7859958a..0e60977c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,11 +32,8 @@ include(opentrack-load-user-settings) set_property(GLOBAL PROPERTY opentrack-all-modules "") set_property(GLOBAL PROPERTY opentrack-all-source-dirs "") -set(opentrack_all-translations "" CACHE STRING "Leave empty for default") -if(".${opentrack_all-translations}" STREQUAL ".") - set(opentrack_all-translations "nl_NL;ru_RU;stub;zh_CN") -endif() +set(opentrack_all-translations "nl_NL;ru_RU;stub;zh_CN") include(opentrack-word-size) include(opentrack-hier) diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake index eced4201..3276b832 100644 --- a/cmake/opentrack-platform.cmake +++ b/cmake/opentrack-platform.cmake @@ -21,9 +21,9 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -if(NOT CMAKE_BUILD_TYPE) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) set(CMAKE_BUILD_TYPE "RELEASE" CACHE STRING "" FORCE) - set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install") + set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "" FORCE) endif() if(APPLE) |