Added debug postfix to install command and fixed library path
authorSaad Khattak <saadrustam@gmail.com>
Tue, 10 Apr 2018 08:03:54 -0700
changeset 11940bfb936894a9d
parent 11939 69afb0599152
child 11941 4d843a32d74e
Added debug postfix to install command and fixed library path
CMakeLists.txt
     1.1 --- a/CMakeLists.txt	Mon Apr 09 10:37:31 2018 -0700
     1.2 +++ b/CMakeLists.txt	Tue Apr 10 08:03:54 2018 -0700
     1.3 @@ -210,8 +210,8 @@
     1.4  set(SDL_LIBS "-lSDL2")
     1.5  set(SDL_CFLAGS "")
     1.6  
     1.7 -# Emscripten toolchain has a nonempty default value for this, and the checks 
     1.8 -# in this file need to change that, so remember the original value, and 
     1.9 +# Emscripten toolchain has a nonempty default value for this, and the checks
    1.10 +# in this file need to change that, so remember the original value, and
    1.11  # restore back to that afterwards. For check_function_exists() to work in
    1.12  # Emscripten, this value must be at its default value.
    1.13  set(ORIG_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
    1.14 @@ -244,7 +244,7 @@
    1.15  set(OPT_DEF_ASM TRUE)
    1.16  if(EMSCRIPTEN)
    1.17    # Set up default values for the currently supported set of subsystems:
    1.18 -  # Emscripten/Javascript does not have assembly support, a dynamic library 
    1.19 +  # Emscripten/Javascript does not have assembly support, a dynamic library
    1.20    # loading architecture, low-level CPU inspection or multithreading.
    1.21    set(OPT_DEF_ASM FALSE)
    1.22    set(SDL_SHARED_ENABLED_BY_DEFAULT OFF)
    1.23 @@ -1001,7 +1001,7 @@
    1.24          #include <linux/kd.h>
    1.25          #include <linux/keyboard.h>
    1.26  
    1.27 -        int main(int argc, char **argv) 
    1.28 +        int main(int argc, char **argv)
    1.29          {
    1.30              struct kbentry kbe;
    1.31              kbe.kb_table = KG_CTRL;
    1.32 @@ -1761,7 +1761,7 @@
    1.33  if(SDL_TEST)
    1.34    file(GLOB TEST_SOURCES ${SDL2_SOURCE_DIR}/src/test/*.c)
    1.35    add_library(SDL2_test STATIC ${TEST_SOURCES})
    1.36 -  
    1.37 +
    1.38    add_subdirectory(test)
    1.39  endif()
    1.40  
    1.41 @@ -1818,7 +1818,7 @@
    1.42      if(NOT ANDROID)
    1.43          install(CODE "
    1.44            execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
    1.45 -          \"libSDL2-2.0.${SOEXT}\" \"libSDL2.${SOEXT}\")")
    1.46 +            \"${SDL2_BINARY_DIR}/libSDL2-2.0${SDL_CMAKE_DEBUG_POSTFIX}.${SOEXT}\" \"${SDL2_BINARY_DIR}/libSDL2.${SOEXT}\")")
    1.47          install(FILES ${SDL2_BINARY_DIR}/libSDL2.${SOEXT} DESTINATION "lib${LIB_SUFFIX}")
    1.48      endif()
    1.49    endif()