diff options
author | Ben Campbell <ben@scumways.com> | 2016-11-08 21:01:23 +1300 |
---|---|---|
committer | Ben Campbell <ben@scumways.com> | 2016-11-08 21:01:23 +1300 |
commit | 6d6c28b915fd0276bd07469c4df7520f437a85a7 (patch) | |
tree | 532e463e660291b47df3ff7b8c6c686a9a4b0d37 /DevIL | |
parent | 7bcd22465324282fb39b98279ba816cd4ef0caa3 (diff) | |
download | devil-6d6c28b915fd0276bd07469c4df7520f437a85a7.tar.gz |
use lower-case keywords for CMakeLists.txt
Diffstat (limited to 'DevIL')
-rw-r--r-- | DevIL/CMakeLists.txt | 14 | ||||
-rw-r--r-- | DevIL/src-IL/CMakeLists.txt | 60 |
2 files changed, 37 insertions, 37 deletions
diff --git a/DevIL/CMakeLists.txt b/DevIL/CMakeLists.txt index c073e88f..09b36f00 100644 --- a/DevIL/CMakeLists.txt +++ b/DevIL/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.6) -PROJECT(ImageLib) +project(ImageLib) # include our custom modules set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") @@ -12,7 +12,7 @@ include (TestBigEndian) include(CMakeDependentOption) #set(CMAKE_C_FLAGS "-std=c99") -OPTION(BUILD_SHARED_LIBS "Build with shared (.DLL .SO) libraries." ON) +option(BUILD_SHARED_LIBS "Build with shared (.DLL .SO) libraries." ON) # various compiler stuff test_big_endian(WORDS_BIGENDIAN) @@ -120,10 +120,10 @@ add_subdirectory(src-IL) # need to check for vc6 or vc2003 output dir -IF(BUILD_SHARED_LIBS) - SET(DEVIL_LIB_DEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/ ) -ELSE(BUILD_SHARED_LIBS) - SET(DEVIL_LIB_DEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/ ) -ENDIF(BUILD_SHARED_LIBS) +if(BUILD_SHARED_LIBS) + set(DEVIL_LIB_DEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/ ) +else(BUILD_SHARED_LIBS) + set(DEVIL_LIB_DEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/ ) +endif(BUILD_SHARED_LIBS) diff --git a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt index 6d140577..a63251a1 100644 --- a/DevIL/src-IL/CMakeLists.txt +++ b/DevIL/src-IL/CMakeLists.txt @@ -1,11 +1,11 @@ -PROJECT(DevIL) +project(DevIL) -FILE(GLOB DevIL_SRCS src/*.c src/*.cpp) -FILE(GLOB DevIL_INC include/*.h ../include/IL/config.h ../include/IL/devil_internal_exports.h ../include/IL/il.h) -FILE(GLOB DevIL_RSRC) -FILE(GLOB DevIL_TXT) +file(GLOB DevIL_SRCS src/*.c src/*.cpp) +file(GLOB DevIL_INC include/*.h ../include/IL/config.h ../include/IL/devil_internal_exports.h ../include/IL/il.h) +file(GLOB DevIL_RSRC) +file(GLOB DevIL_TXT) -INCLUDE_DIRECTORIES( +include_directories( ${DevIL_SOURCE_DIR}/include ${DevIL_SOURCE_DIR}/../include @@ -13,36 +13,36 @@ INCLUDE_DIRECTORIES( #SET(DevIL_INC ${DEVIL_INCS} ${DEVIL_SRCS}) -SET(LIBRARY_OUTPUT_PATH ${DEVIL_LIB_DEST_DIR} ) +set(LIBRARY_OUTPUT_PATH ${DEVIL_LIB_DEST_DIR} ) # # for windows add the .def and .rc files to the source list # -IF(WIN32) - ADD_DEFINITIONS(-DIL_USE_PRAGMA_LIBS) - IF(BUILD_SHARED_LIBS) +if(WIN32) + add_definitions(-DIL_USE_PRAGMA_LIBS) + if(BUILD_SHARED_LIBS) #ADD_DEFINITIONS(-DIL_DLL -DMNG_DLL -DMNG_USE_DLL -DJPEGDLL) - ADD_DEFINITIONS(-DIL_DLL -DJPEGSTATIC) - SET(DevIL_SRCS ${DevIL_SRCS} msvc/il.def) - SET(DevIL_RSRC ${DevIL_RSRC} "msvc/resources/IL Logo.ico" msvc/IL.rc) - SET(DevIL_TXT ${DevIL_TXT} ../AUTHORS ../ChangeLog ../CREDITS ../libraries.txt ../README ../README.cmake ../TODO) + add_definitions(-DIL_DLL -DJPEGSTATIC) + set(DevIL_SRCS ${DevIL_SRCS} msvc/il.def) + set(DevIL_RSRC ${DevIL_RSRC} "msvc/resources/IL Logo.ico" msvc/IL.rc) + set(DevIL_TXT ${DevIL_TXT} ../AUTHORS ../ChangeLog ../CREDITS ../libraries.txt ../README ../README.cmake ../TODO) # SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:msvcrt.lib ") - SET(CMAKE_C_FLAGS_RELEASE "/MT /O2") - ELSE(BUILD_SHARED_LIBS) - ADD_DEFINITIONS(-DIL_STATIC_LIB -DJPEGSTATIC) - ENDIF(BUILD_SHARED_LIBS) -ENDIF(WIN32) - -SOURCE_GROUP("Source Files" FILES src/*.c src/*.cpp) -SOURCE_GROUP("Header Files" FILES ${DevIL_INC} ) -SOURCE_GROUP("Resource Files" FILES ${DevIL_RSRC} ) -SOURCE_GROUP("Text Files" FILES ${DevIL_TXT} ) - -IF(BUILD_SHARED_LIBS) - ADD_LIBRARY(IL SHARED ${DevIL_SRCS} ${DevIL_INC} ${DevIL_RSRC} ${DevIL_TXT}) -ELSE(BUILD_SHARED_LIBS) - ADD_LIBRARY(IL ${DevIL_SRCS} ${DevIL_INC} ${DevIL_RSRC} ${DevIL_TXT}) -ENDIF(BUILD_SHARED_LIBS) + set(CMAKE_C_FLAGS_RELEASE "/MT /O2") + else(BUILD_SHARED_LIBS) + add_definitions(-DIL_STATIC_LIB -DJPEGSTATIC) + endif(BUILD_SHARED_LIBS) +endif(WIN32) + +source_group("Source Files" FILES src/*.c src/*.cpp) +source_group("Header Files" FILES ${DevIL_INC} ) +source_group("Resource Files" FILES ${DevIL_RSRC} ) +source_group("Text Files" FILES ${DevIL_TXT} ) + +if(BUILD_SHARED_LIBS) + add_library(IL SHARED ${DevIL_SRCS} ${DevIL_INC} ${DevIL_RSRC} ${DevIL_TXT}) +else(BUILD_SHARED_LIBS) + add_library(IL ${DevIL_SRCS} ${DevIL_INC} ${DevIL_RSRC} ${DevIL_TXT}) +endif(BUILD_SHARED_LIBS) # configure include dirs and linkage for the optional external libs |