For CMake projects, it is common practice to have build/ as build directory, and i had more than one case when i did cd build/ && rm -rf * && cmake ../ and then wondered what is wrong.
Also cmake/modules/ seems to be generally-accepted path for CMake modules. Signed-off-by: Roman Lebedev <[email protected]> --- .gitignore | 2 +- CMakeLists.txt | 2 +- build/CMakeModules/FindGLIB2.cmake | 69 -------------------------------- build/CMakeModules/toolchain_win32.cmake | 18 --------- cmake/modules/FindGLIB2.cmake | 69 ++++++++++++++++++++++++++++++++ cmake/modules/toolchain_win32.cmake | 18 +++++++++ 6 files changed, 89 insertions(+), 89 deletions(-) delete mode 100644 build/CMakeModules/FindGLIB2.cmake delete mode 100644 build/CMakeModules/toolchain_win32.cmake create mode 100644 cmake/modules/FindGLIB2.cmake create mode 100644 cmake/modules/toolchain_win32.cmake diff --git a/.gitignore b/.gitignore index 6333cdc..7081312 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -cmake_build/ +build/ include/config.h include/lensfun/lensfun.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 161ea6b..4c23143 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR ) # path for helper modules -set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/build/CMakeModules) +set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_SOURCE_DIR}/cmake/modules") GET_FILENAME_COMPONENT(SOURCE_BASE_DIR ${CMAKE_SOURCE_DIR} PATH CACHE) # global setup diff --git a/build/CMakeModules/FindGLIB2.cmake b/build/CMakeModules/FindGLIB2.cmake deleted file mode 100644 index 7c39093..0000000 --- a/build/CMakeModules/FindGLIB2.cmake +++ /dev/null @@ -1,69 +0,0 @@ -IF (NOT MSVC) - INCLUDE(FindPkgConfig) - PKG_SEARCH_MODULE( GLIB2 REQUIRED glib-2.0 ) - IF(WIN32 AND NOT BUILD_STATIC) - FIND_FILE(GLIB2_DLL - NAMES glib-2.dll glib-2-vs9.dll libglib-2.0-0.dll - PATHS "${GLIB2_LIBRARY_DIRS}/../bin" - NO_SYSTEM_ENVIRONMENT_PATH) - ENDIF() -ENDIF() - -IF (NOT GLIB2_FOUND OR NOT PKG_CONFIG_FOUND) - FIND_PATH(GLIB2_GLIB2CONFIG_INCLUDE_PATH - NAMES glibconfig.h - PATHS - /usr/local/lib - /usr/lib - /usr/lib64 - /opt/local/lib - ${GLIB2_BASE_DIR}/lib - ${CMAKE_LIBRARY_PATH} - PATH_SUFFIXES glib-2.0/include - ) - - - FIND_PATH(GLIB2_INCLUDE_DIRS - NAMES glib.h - PATHS - /usr/local/include - /usr/include - /opt/local/include - ${GLIB2_BASE_DIR}/include - PATH_SUFFIXES gtk-2.0 glib-2.0 glib20 - ) - - FIND_LIBRARY(GLIB2_LIBRARIES - NAMES glib-2.0 glib20 glib - PATHS - /usr/local/lib - /usr/lib - /usr/lib64 - /opt/local/lib - ${GLIB2_BASE_DIR}/lib - ) - - IF(GLIB2_GLIB2CONFIG_INCLUDE_PATH AND GLIB2_INCLUDE_DIRS AND GLIB2_LIBRARIES) - SET( GLIB2_INCLUDE_DIRS ${GLIB2_GLIB2CONFIG_INCLUDE_PATH} ${GLIB2_INCLUDE_DIRS} ) - SET( GLIB2_LIBRARIES ${GLIB2_LIBRARIES} ) - SET( GLIB2_FOUND 1 ) - ELSE() - SET( GLIB2_INCLUDE_DIRS ) - SET( GLIB2_LIBRARIES ) - SET( GLIB2_FOUND 0) - ENDIF() - - IF(WIN32 AND NOT BUILD_STATIC) - FIND_FILE(GLIB2_DLL - NAMES glib-2.dll glib-2-vs9.dll libglib-2.0-0.dll - PATHS "${GLIB2_BASE_DIR}/bin" - NO_SYSTEM_ENVIRONMENT_PATH) - ENDIF() -ENDIF () - -#INCLUDE( FindPackageHandleStandardArgs ) -#FIND_PACKAGE_HANDLE_STANDARD_ARGS( GLIB2 DEFAULT_MSG GLIB2_LIBRARIES GLIB2_GLIB2CONFIG_INCLUDE_PATH GLIB2_GLIB2_INCLUDE_PATH ) - -IF (NOT GLIB2_FOUND AND GLIB2_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find glib2") -ENDIF() diff --git a/build/CMakeModules/toolchain_win32.cmake b/build/CMakeModules/toolchain_win32.cmake deleted file mode 100644 index 09159fa..0000000 --- a/build/CMakeModules/toolchain_win32.cmake +++ /dev/null @@ -1,18 +0,0 @@ -#me of the target operating system -SET(CMAKE_SYSTEM_NAME Windows) - -# which compilers to use for C and C++ -SET(CMAKE_C_COMPILER i686-w64-mingw32-gcc) -SET(CMAKE_CXX_COMPILER i686-w64-mingw32-g++) -SET(CMAKE_RC_COMPILER i686-w64-mingw32-windres) - -# here is the target environment located -SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32/) -SET(LENSFUN_INSTALL_PREFIX /usr/i686-w64-mingw32/) - -# adjust the default behaviour of the FIND_XXX() commands: -# search headers and libraries in the target environment, search -# programs in the host environment -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) diff --git a/cmake/modules/FindGLIB2.cmake b/cmake/modules/FindGLIB2.cmake new file mode 100644 index 0000000..7c39093 --- /dev/null +++ b/cmake/modules/FindGLIB2.cmake @@ -0,0 +1,69 @@ +IF (NOT MSVC) + INCLUDE(FindPkgConfig) + PKG_SEARCH_MODULE( GLIB2 REQUIRED glib-2.0 ) + IF(WIN32 AND NOT BUILD_STATIC) + FIND_FILE(GLIB2_DLL + NAMES glib-2.dll glib-2-vs9.dll libglib-2.0-0.dll + PATHS "${GLIB2_LIBRARY_DIRS}/../bin" + NO_SYSTEM_ENVIRONMENT_PATH) + ENDIF() +ENDIF() + +IF (NOT GLIB2_FOUND OR NOT PKG_CONFIG_FOUND) + FIND_PATH(GLIB2_GLIB2CONFIG_INCLUDE_PATH + NAMES glibconfig.h + PATHS + /usr/local/lib + /usr/lib + /usr/lib64 + /opt/local/lib + ${GLIB2_BASE_DIR}/lib + ${CMAKE_LIBRARY_PATH} + PATH_SUFFIXES glib-2.0/include + ) + + + FIND_PATH(GLIB2_INCLUDE_DIRS + NAMES glib.h + PATHS + /usr/local/include + /usr/include + /opt/local/include + ${GLIB2_BASE_DIR}/include + PATH_SUFFIXES gtk-2.0 glib-2.0 glib20 + ) + + FIND_LIBRARY(GLIB2_LIBRARIES + NAMES glib-2.0 glib20 glib + PATHS + /usr/local/lib + /usr/lib + /usr/lib64 + /opt/local/lib + ${GLIB2_BASE_DIR}/lib + ) + + IF(GLIB2_GLIB2CONFIG_INCLUDE_PATH AND GLIB2_INCLUDE_DIRS AND GLIB2_LIBRARIES) + SET( GLIB2_INCLUDE_DIRS ${GLIB2_GLIB2CONFIG_INCLUDE_PATH} ${GLIB2_INCLUDE_DIRS} ) + SET( GLIB2_LIBRARIES ${GLIB2_LIBRARIES} ) + SET( GLIB2_FOUND 1 ) + ELSE() + SET( GLIB2_INCLUDE_DIRS ) + SET( GLIB2_LIBRARIES ) + SET( GLIB2_FOUND 0) + ENDIF() + + IF(WIN32 AND NOT BUILD_STATIC) + FIND_FILE(GLIB2_DLL + NAMES glib-2.dll glib-2-vs9.dll libglib-2.0-0.dll + PATHS "${GLIB2_BASE_DIR}/bin" + NO_SYSTEM_ENVIRONMENT_PATH) + ENDIF() +ENDIF () + +#INCLUDE( FindPackageHandleStandardArgs ) +#FIND_PACKAGE_HANDLE_STANDARD_ARGS( GLIB2 DEFAULT_MSG GLIB2_LIBRARIES GLIB2_GLIB2CONFIG_INCLUDE_PATH GLIB2_GLIB2_INCLUDE_PATH ) + +IF (NOT GLIB2_FOUND AND GLIB2_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find glib2") +ENDIF() diff --git a/cmake/modules/toolchain_win32.cmake b/cmake/modules/toolchain_win32.cmake new file mode 100644 index 0000000..09159fa --- /dev/null +++ b/cmake/modules/toolchain_win32.cmake @@ -0,0 +1,18 @@ +#me of the target operating system +SET(CMAKE_SYSTEM_NAME Windows) + +# which compilers to use for C and C++ +SET(CMAKE_C_COMPILER i686-w64-mingw32-gcc) +SET(CMAKE_CXX_COMPILER i686-w64-mingw32-g++) +SET(CMAKE_RC_COMPILER i686-w64-mingw32-windres) + +# here is the target environment located +SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32/) +SET(LENSFUN_INSTALL_PREFIX /usr/i686-w64-mingw32/) + +# adjust the default behaviour of the FIND_XXX() commands: +# search headers and libraries in the target environment, search +# programs in the host environment +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -- 2.6.1 ------------------------------------------------------------------------------ Full-scale, agent-less Infrastructure Monitoring from a single dashboard Integrate with 40+ ManageEngine ITSM Solutions for complete visibility Physical-Virtual-Cloud Infrastructure monitoring from one console Real user monitoring with APM Insights and performance trend reports Learn More http://pubads.g.doubleclick.net/gampad/clk?id=247754911&iu=/4140 _______________________________________________ Lensfun-users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/lensfun-users
