Преглед на файлове

moving cmake configure_file to appropriate location

Chris Russ преди 9 години
родител
ревизия
c57b524a59
променени са 3 файла, в които са добавени 4 реда и са изтрити 4 реда
  1. 1 0
      .gitignore
  2. 2 4
      CMakeLists.txt
  3. 1 0
      code/CMakeLists.txt

+ 1 - 0
.gitignore

@@ -18,6 +18,7 @@ assimp.pc
 revision.h
 revision.h
 contrib/zlib/zconf.h
 contrib/zlib/zconf.h
 contrib/zlib/zlib.pc
 contrib/zlib/zlib.pc
+include/assimp/config.h
 
 
 # CMake
 # CMake
 CMakeCache.txt
 CMakeCache.txt

+ 2 - 4
CMakeLists.txt

@@ -95,11 +95,9 @@ configure_file(
   ${CMAKE_CURRENT_BINARY_DIR}/revision.h
   ${CMAKE_CURRENT_BINARY_DIR}/revision.h
 )
 )
 
 
-SET( HEADER_PATH include/assimp )
-
 configure_file(
 configure_file(
-  ${HEADER_PATH}/config.h.in
-  ${ASSIMP_INCLUDE_INSTALL_DIR}/assimp/config.h
+  ${CMAKE_CURRENT_LIST_DIR}/include/assimp/config.h.in
+  ${CMAKE_CURRENT_LIST_DIR}/include/assimp/config.h
 )
 )
 
 
 include_directories(
 include_directories(

+ 1 - 0
code/CMakeLists.txt

@@ -58,6 +58,7 @@ SET( PUBLIC_HEADERS
   ${HEADER_PATH}/camera.h
   ${HEADER_PATH}/camera.h
   ${HEADER_PATH}/color4.h
   ${HEADER_PATH}/color4.h
   ${HEADER_PATH}/color4.inl
   ${HEADER_PATH}/color4.inl
+  ${HEADER_PATH}/config.h
   ${HEADER_PATH}/defs.h
   ${HEADER_PATH}/defs.h
   ${HEADER_PATH}/cfileio.h
   ${HEADER_PATH}/cfileio.h
   ${HEADER_PATH}/light.h
   ${HEADER_PATH}/light.h