diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-12-27 18:57:31 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-12-27 18:57:43 +0300 |
| commit | a36b5228694731483ea201668bf0775b6deb1973 (patch) | |
| tree | 48f3dc9494ac89cc5366bc793087de575f6b57da /CMakeLists.txt | |
| parent | fcc68a02e9a315fad0e1ff0df1bb3e35f1a65fe4 (diff) | |
CMake: make install prefix option irrelevant for MinGW too.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ca23e760ff0..2d4fb2b7254 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -469,7 +469,7 @@ if(WITH_GLEW_ES AND WITH_SYSTEM_GLEW) set(WITH_SYSTEM_GLEW OFF) endif() -if(MSVC) +if(WIN32) getDefaultWindowsPrefixBase(CMAKE_GENERIC_PROGRAM_FILES) set(CPACK_INSTALL_PREFIX ${CMAKE_GENERIC_PROGRAM_FILES}/${}) endif() @@ -492,7 +492,7 @@ option_defaults_clear() # By default we want to install to the directory we are compiling our executables # unless specified otherwise, which we currently do not allow if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - if(MSVC) + if(WIN32) set(CMAKE_INSTALL_PREFIX ${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE} CACHE PATH "default install path" FORCE) elseif(APPLE) set(CMAKE_INSTALL_PREFIX ${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE} CACHE PATH "default install path" FORCE) @@ -1338,9 +1338,7 @@ elseif(WIN32) set(PNG_LIBPATH ${PNG}/lib) # not cmake defined endif() - if(MSVC) - set(JPEG_NAMES ${JPEG_NAMES} libjpeg) - endif() + set(JPEG_NAMES ${JPEG_NAMES} libjpeg) find_package(jpeg REQUIRED) set(PTHREADS_INCLUDE_DIRS ${LIBDIR}/pthreads/include) |